Redundant class cleanup #86
Conversation
| UnitType=Units.CURRENCY, | ||
| PreferredUnits=CurrencyUnit.MDOLLARS, | ||
| CurrentUnits=CurrencyUnit.MDOLLARS, | ||
| ) | ||
| self.Coam = self.OutputParameterDict[self.Coam.Name] = OutputParameter( |
There was a problem hiding this comment.
Parent class units are MDOLLARSPERYEAR while SUTRA units are KDOLLARSPERYEAR
There was a problem hiding this comment.
The same applies for self.annualpumpingcosts on line 44 below, which is not commentable in this PR due to technically not being part of the diff.
| PreferredUnits=CurrencyUnit.MDOLLARS, | ||
| CurrentUnits=CurrencyUnit.MDOLLARS, | ||
| ) | ||
|
|
||
| self.annualngcost = self.OutputParameterDict[self.annualngcost.Name] = OutputParameter( |
There was a problem hiding this comment.
Parent class units are MDOLLARSPERYEAR while SUTRA units are KDOLLARSPERYEAR
| @@ -347,7 +126,7 @@ def Calculate(self, model: Model) -> None: | |||
| # Drilling | |||
|
|
|||
| self.C1well = 0 | |||
| if self.ccwellfixed.Valid: | |||
| if self.per_production_well_cost.Valid: | |||
There was a problem hiding this comment.
Note that Economics.ccwellfixed was renamed to per_production_well_cost in ac08741#diff-372dea2554a92733824c98709c9bdb5720c183c31762c3795bd3990f069a2f24R600; thus this change is simply to use the correct variable instead of redefining it redundantly with the old name.
| self.C1well = self.C1well * self.ccwelladjfactor.value | ||
| self.C1well = self.C1well * self.production_well_cost_adjustment_factor.value |
There was a problem hiding this comment.
Note that ccwelladjfactor was refactored to injection_well_cost_adjustment_factor in NREL@ac08741 as well
Description
SBTEconomicsandSUTRAEconomicsthat already exists inEconomicsparent classSUTRAEconomicsbecause it was incidentally trivial to implement in the course of refactoring. (Hardcoded peaking boiler cost in SUTRA was overlooked byPeaking Boiler Cost per kW; Increase allowed fractures; HonorCapital Cost for Power Plant; Client caching fix;Cape-4laterals & res. vol.; Doublets parameter [v3.9.28] NREL/GEOPHIRES-X#394, which resolved Feature Request: DH LCOH with peaking boiler cost = 0 NREL/GEOPHIRES-X#392.)Testing & Verification
SUTRAEconomicsretains a few seemingly-redundant parameters from parent class (Economics) includingannualngcost,LCOHandCoam. However, they are not actually redundant because use different units than the parent class, and thus removing their re-declarations inSUTRAEconomicswould be a backwards-incompatible change.